Merge from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Sun, 15 Apr 2012 07:31:15 +0000 (15:31 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 15 Apr 2012 07:31:15 +0000 (15:31 +0800)

Trivial merge